# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/07/27 10:17:42-06:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/ia64-extras
#   into hp.com:/home/helgaas/linux/linux-ia64-2.4
# 
# drivers/net/tg3.h
#   2004/07/27 10:17:40-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/net/tg3.c
#   2004/07/27 10:17:40-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/07/27 10:15:51-06:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/linux-2.4
#   into hp.com:/home/helgaas/linux/ia64-extras
# 
# drivers/net/tg3.h
#   2004/07/27 10:15:50-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/net/tg3.c
#   2004/07/27 10:15:49-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
#